From 4bae1dc6a3d22e1f81f4fa82962830bd4efe1bcd Mon Sep 17 00:00:00 2001
From: "vh249@arcadians.cl.cam.ac.uk" <vh249@arcadians.cl.cam.ac.uk>
Date: Wed, 27 Apr 2005 16:55:30 +0000
Subject: [PATCH] bitkeeper revision 1.1387 (426fc402cahZ53Mlz7Pca5KY50Y6tA)

include/xen/banner.h will be only change if there's differences with the new one.
add correct dependencies, so that console.c is now rebuild when necessary now.

Signed-off-by: Vincent Hanquez <vincent@xensource.com>
---
 xen/Makefile              | 9 ++++-----
 xen/arch/x86/Makefile     | 2 +-
 xen/drivers/char/Makefile | 2 ++
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/xen/Makefile b/xen/Makefile
index f4a7c6f8d9..9aee6df4c6 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -47,8 +47,7 @@ clean: delete-unfresh-files
 	rm -f include/asm-*/asm-offsets.h
 	rm -f tools/figlet/*.o tools/figlet/figlet
 
-$(TARGET): delete-unfresh-files
-	$(MAKE) include/xen/compile.h
+$(TARGET): delete-unfresh-files include/xen/compile.h
 	[ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm
 	$(MAKE) -C arch/$(TARGET_ARCH) asm-offsets.s
 	$(MAKE) include/asm-$(TARGET_ARCH)/asm-offsets.h
@@ -56,9 +55,8 @@ $(TARGET): delete-unfresh-files
 	$(MAKE) -C drivers
 	$(MAKE) -C arch/$(TARGET_ARCH)
 
-# drivers/char/console.o may contain static banner/compile info. Blow it away.
 delete-unfresh-files:
-	rm -f include/xen/banner.h include/xen/compile.h drivers/char/console.o
+	rm -f include/xen/compile.h
 	$(MAKE) -C arch/$(TARGET_ARCH) delete-unfresh-files
 
 # compile.h contains dynamic build info. Rebuilt on every 'make' invocation.
@@ -83,9 +81,10 @@ tools/figlet/figlet: tools/figlet/figlet.o
 tools/figlet/figlet.o: tools/figlet/figlet.c
 	$(HOSTCC) -o $@ -c $<
 
+.PHONY: include/xen/banner.h
 include/xen/banner.h: tools/figlet/figlet tools/figlet/xen.flf
 	tools/figlet/figlet -d tools/figlet Xen $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) > $@.new
-	@mv -f $@.new $@
+	@cmp $@.new $@ && rm -f $@.new || mv -f $@.new $@
 
 include/asm-$(TARGET_ARCH)/asm-offsets.h: arch/$(TARGET_ARCH)/asm-offsets.s
 	@(set -e; \
diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index 42d828f7f5..7f2436dc0a 100644
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -13,7 +13,7 @@ endif
 
 default: $(TARGET)
 
-$(TARGET): $(TARGET)-syms boot/mkelf32
+$(TARGET): $(TARGET)-syms boot/mkelf32 ../../include/xen/compile.h
 	./boot/mkelf32 $(TARGET)-syms $(TARGET) 0x100000
 
 $(CURDIR)/arch.o: $(OBJS)
diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile
index 957a4bc5a2..d79e545102 100644
--- a/xen/drivers/char/Makefile
+++ b/xen/drivers/char/Makefile
@@ -5,5 +5,7 @@ default: driver.o
 driver.o: $(OBJS)
 	$(LD) $(LDFLAGS) -r -o driver.o $(OBJS)
 
+console.o: ../../include/xen/banner.h
+
 clean:
 	rm -f *.o *~ core
-- 
2.30.2